Merge tag 'upstream/2016.13' into debian/master
authorSimon McVittie <smcv@debian.org>
Sun, 20 Nov 2016 15:41:41 +0000 (15:41 +0000)
committerSimon McVittie <smcv@debian.org>
Sun, 20 Nov 2016 15:41:41 +0000 (15:41 +0000)
Upstream version 2016.13


Trivial merge